From 77ed66eba9783c662939bdb4704289f4b32a065c Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 13 Nov 2006 14:12:01 +0000 Subject: [PATCH] [XEN] x86-64: don't compile some unused machine check code Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mcheck/Makefile | 6 +++--- xen/arch/x86/cpu/mcheck/mce.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/Makefile b/xen/arch/x86/cpu/mcheck/Makefile index fbf8f0a177..a5cbb02b7b 100644 --- a/xen/arch/x86/cpu/mcheck/Makefile +++ b/xen/arch/x86/cpu/mcheck/Makefile @@ -2,6 +2,6 @@ obj-y += k7.o obj-y += mce.o obj-y += non-fatal.o obj-y += p4.o -obj-y += p5.o -obj-y += p6.o -obj-y += winchip.o +obj-$(x86_32) += p5.o +obj-$(x86_32) += p6.o +obj-$(x86_32) += winchip.o diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 68a8ff59ed..4714eb3013 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -39,18 +39,22 @@ void mcheck_init(struct cpuinfo_x86 *c) break; case X86_VENDOR_INTEL: +#ifndef CONFIG_X86_64 if (c->x86==5) intel_p5_mcheck_init(c); if (c->x86==6) intel_p6_mcheck_init(c); +#endif if (c->x86==15) intel_p4_mcheck_init(c); break; +#ifndef CONFIG_X86_64 case X86_VENDOR_CENTAUR: if (c->x86==5) winchip_mcheck_init(c); break; +#endif default: break; -- 2.30.2